[stable-3.30] Nmc/1901 Conflict dialog#291
Closed
surinder-tsys wants to merge 1 commit intostable-3.30from
Closed
Conversation
surinder-tsys
added
custom
surinder-tsys
force-pushed
the
backport/nmc/62/stable-3.30
branch
from
6b56344 to
218221d
Compare
surinder-tsys
force-pushed
the
backport/nmc/62/stable-3.30
branch
from
218221d to
97ea5b2
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
stable-3.30 baseline for
#62[stable-3.30] Nmc/1901 Conflict dialog